VPLAY-11143: AAMP mp4Demux Integration #670

Vinish100 · 2025-11-13T09:52:44Z

Reason for change: Integrate mp4Demux formally into AAMP
Test Procedure: Test with useMp4Demux=true and validate all types of Linear, VOD content in all apps.
Risks: Medium

Copilot

Pull Request Overview

This PR integrates the mp4Demux component formally into AAMP to enable demuxing of MP4 fragmented content. The integration adds support for handling both linear and VOD content through a new configuration option eAAMPConfig_UseMp4Demux.

Key Changes:

Introduces new Mp4Demux class to parse MP4 boxes and extract media samples with DRM metadata
Adds AampMp4Demuxer wrapper class implementing the MediaProcessor interface for AAMP integration
Defines new data types (AampCodecInfo, AampMediaSample, AampDrmMetadata) to represent demuxed content
Updates GStreamer pipeline integration to handle demuxed samples directly instead of forwarding full segments

Reviewed Changes

Copilot reviewed 22 out of 22 changed files in this pull request and generated 14 comments.

Show a summary per file

File	Description
mp4demux/Mp4Demux.hpp	New core MP4 demuxer implementation with box parsing and sample extraction logic
mp4demux/AampMp4Demuxer.h/cpp	AAMP integration wrapper that adapts Mp4Demux to MediaProcessor interface
AampDemuxDataTypes.h	Common data type definitions for codec info, samples, and DRM metadata
streamabstraction.cpp	Updates media processor initialization to conditionally use Mp4Demux based on config
priv_aamp.h/cpp	Adds new SendStreamTransfer and SetStreamCaps methods for sample-based transfer
aampgstplayer.h/cpp	Updates GStreamer integration to handle MediaSample objects and set stream caps
middleware/InterfacePlayerRDK.h/cpp	Defines GStreamer-specific data types and updates SendHelper signature
StreamSink.h	Adds abstract SendSample and SetStreamCaps methods to base interface
aampgstplayer.h	Updates AAMPGstPlayer SendHelper signature to accept MediaSample
AampStreamSinkInactive.h	Adds stub SendSample implementation for inactive streams
mediaprocessor.h	Adds getCodecInfo virtual method to MediaProcessor base class
isobmff/isobmffprocessor.h	Implements getCodecInfo for ISO BMFF processor
fragmentcollector_mpd.h/cpp	Adds GetStreamCodecInfo to retrieve codec information from tracks
test/aampcli/AampcliPlaybackCommand.cpp	Updates CLI tool to use new Mp4Demux API with shared_ptr and detailed sample logging
test/qtdemuxAnalyzer/qtdemuxAnalyzer.cpp	Improves caps logging by converting full caps to string
test/gstTestHarness/mp4demux.hpp	Renames fields (horizresolution→horizontal_resolution, etc.) and fixes spelling
CMakeLists.txt	Updates include paths and source list to include mp4demux directory

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2025-11-13T09:59:21Z

aampgstplayer.cpp

+{
+	CodecInfo gstCodecInfo;
+	gstCodecInfo.codecFormat = (GstStreamOutputFormat)codecInfo.mCodecFormat;
+	gstCodecInfo.codecData = std::move(codecInfo.mCodecData);


The std::move(codecInfo.mCodecData) operation may cause issues if the source codecInfo is used again later. Since this is converting between data types, consider using a copy instead: gstCodecInfo.codecData = codecInfo.mCodecData;

Suggested change

gstCodecInfo.codecData = std::move(codecInfo.mCodecData);

gstCodecInfo.codecData = codecInfo.mCodecData;

mp4demux/Mp4Demux.hpp

streamabstraction.cpp

isobmff/isobmffprocessor.h

AampDemuxDataTypes.h

mp4demux/Mp4Demux.hpp

middleware/InterfacePlayerRDK.h

mp4demux/AampMp4Demuxer.cpp

mediaprocessor.h

rdkcmf-jenkins · 2025-11-13T12:08:26Z

Coverity Issue - Data race condition

Accessing "this->mPauseInjector" without holding lock "InterfacePlayerRDK.mSourceSetupMutex". Elsewhere, "InterfacePlayerRDK.mPauseInjector" is written to with "InterfacePlayerRDK.mSourceSetupMutex" held 2 out of 2 times (2 of these accesses strongly imply that it is necessary).

Medium Impact, CWE-366
MISSING_LOCK

Issue location

This issue was discovered outside the diff for this Pull Request. You can find it at:
middleware/InterfacePlayerRDK.cpp:3067

aampgstplayer.cpp

middleware/InterfacePlayerRDK.cpp

aampgstplayer.cpp

AampDemuxDataTypes.h

test/aampcli/AampcliPlaybackCommand.cpp

Copilot

Pull Request Overview

Copilot reviewed 22 out of 22 changed files in this pull request and generated 15 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

test/aampcli/AampcliPlaybackCommand.cpp

mp4demux/AampMp4Demuxer.cpp

streamabstraction.cpp

aampgstplayer.h

test/aampcli/AampcliPlaybackCommand.cpp

mp4demux/AampMp4Demuxer.cpp

aampgstplayer.cpp

priv_aamp.cpp

middleware/InterfacePlayerRDK.h

Copilot

Pull Request Overview

Copilot reviewed 22 out of 22 changed files in this pull request and generated 7 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

AampDemuxDataTypes.h

test/aampcli/AampcliPlaybackCommand.cpp

middleware/InterfacePlayerRDK.cpp

aampgstplayer.cpp

aampgstplayer.h

test/aampcli/AampcliPlaybackCommand.cpp

mp4demux/Mp4Demux.hpp

Copilot

Pull Request Overview

Copilot reviewed 22 out of 22 changed files in this pull request and generated 6 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

AampDemuxDataTypes.h

aampgstplayer.cpp

Copilot

Pull request overview

Copilot reviewed 39 out of 40 changed files in this pull request and generated 7 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

AampDemuxDataTypes.h

middleware/InterfacePlayerRDK.cpp

aampgstplayer.cpp

middleware/InterfacePlayerRDK.cpp

mp4demux/MP4Demux.cpp

mp4demux/AampMp4Demuxer.cpp

mp4demux/MP4Demux.cpp

Copilot

Pull request overview

Copilot reviewed 52 out of 53 changed files in this pull request and generated 3 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

test/aampcli/AampcliPlaybackCommand.cpp

test/gstTestHarness/mp4demux.hpp

middleware/InterfacePlayerRDK.cpp

pstroffolino · 2025-12-01T14:26:43Z

mp4demux/AampMp4Demuxer.h

+	 * @param[in] frameRate - rate per second
+	 * @return void
+	 */
+	void setFrameRateForTM (int frameRate) override { }


should spell out "TrickMode" rather than using "TM" abbreviation

pstroffolino · 2025-12-01T14:27:26Z

mp4demux/AampMp4Demuxer.h

+	/**
+	 * @brief optionally specify new pts offset to apply for subsequently injected TS media segments
+	 */
+	void setPtsOffset( double ptsOffset ) override { };


assuming this for non-invasive pts restamping?

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

rdkcmf-jenkins · 2025-12-04T09:27:25Z

Coverity Issue - Resource leak in object

Allocating memory by calling "new Configs".

High Impact, CWE-401
CTOR_DTOR_LEAK

Issue location

This issue was discovered outside the diff for this Pull Request. You can find it at:
middleware/InterfacePlayerRDK.cpp:77

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

Reason for change: Integrate mp4Demux formally into AAMP Test Procedure: Test with useMp4Demux=true and validate all types of Linear, VOD content in all apps. Risks: Low Signed-off-by: Vinish100 <[email protected]>

Reason for change: Added function headers, split up Mp4Demux.hpp to a .h and .cpp. Code cleanup Test Procedure: Play clear and encrypted content using mp4demux Risks: Low Signed-off-by: Vinish100 <[email protected]>

Reason for change: Ensure coding guidelines are strictly followed. Code cleanup. Enforce encrypted caps are persisted when processing clear samples in between Test Procedure: As mentioned in the ticket Risks: None Signed-off-by: Vinish100 <[email protected]>

Reason for change: Fix L1s with Mp4Demux Test Procedure: Test with useMp4Demux=true and validate all types of Linear, VOD content in all apps. Risks: Low Signed-off-by: lashmintha <[email protected]>

Reason for change: Fix review comments. Introduced error detection and propogation in Mp4Demuxer. Code cleanup Test Procedure: As mentioned in the ticket Risks: Low Signed-off-by: Vinish100 <[email protected]>

Reason for change:pipeline reconfigure is avoided if stream format is unknown Procedure: As mentioned in the ticket Risks: Low Signed-off-by: varshnie <[email protected]>

Reason for change:Removed isobmff format setting hack Procedure: As mentioned in the ticket Risks: Low Signed-off-by: varshnie <[email protected]>

Reason for change: Included possible L1 test for validating Mp4demux functionality, 1. Added AampMp4DemuxTests tests which validates SendSegment() in possible scenario's 2. Added Mp4BoxParsingtests which validates all the box parsing pssh, saiz, senc, trun, tfhd, moof, tenc, ftyp Test Procedure: Test with useMp4Demux=true and validate all types of Linear, VOD content in all apps. Risks: Low Signed-off-by: lashmintha <[email protected]>

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

Vinish100 requested a review from a team as a code owner November 13, 2025 09:52

Copilot AI review requested due to automatic review settings November 13, 2025 09:52

Copilot started reviewing on behalf of Vinish100 November 13, 2025 09:53 View session

Copilot finished reviewing on behalf of Vinish100 November 13, 2025 09:56

Copilot AI reviewed Nov 13, 2025

View reviewed changes

Vinish100 force-pushed the feature/VPLAY-11143 branch from 62a459c to b7af6da Compare November 13, 2025 11:52

rdkcmf-jenkins reviewed Nov 13, 2025

View reviewed changes

Copilot AI review requested due to automatic review settings November 13, 2025 12:31

Vinish100 force-pushed the feature/VPLAY-11143 branch from b7af6da to 5a25935 Compare November 13, 2025 12:31

Copilot started reviewing on behalf of Vinish100 November 13, 2025 12:31 View session

Copilot finished reviewing on behalf of Vinish100 November 13, 2025 12:35

Copilot AI reviewed Nov 13, 2025

View reviewed changes

Vinish100 force-pushed the feature/VPLAY-11143 branch from 5a25935 to 8eaf1e4 Compare November 13, 2025 16:57

Copilot AI review requested due to automatic review settings November 14, 2025 14:56

Vinish100 force-pushed the feature/VPLAY-11143 branch from 8eaf1e4 to ee168c9 Compare November 14, 2025 14:56

Copilot started reviewing on behalf of Vinish100 November 14, 2025 14:56 View session

Copilot finished reviewing on behalf of Vinish100 November 14, 2025 14:58

Copilot AI reviewed Nov 14, 2025

View reviewed changes

Vinish100 force-pushed the feature/VPLAY-11143 branch from ee168c9 to 7af0feb Compare November 17, 2025 08:05

Copilot AI review requested due to automatic review settings November 17, 2025 08:42

Vinish100 force-pushed the feature/VPLAY-11143 branch from 7af0feb to 5cd2eac Compare November 17, 2025 08:42

Copilot started reviewing on behalf of Vinish100 November 17, 2025 08:42 View session

Copilot finished reviewing on behalf of Vinish100 November 17, 2025 08:46

Copilot AI reviewed Nov 17, 2025

View reviewed changes

Vinish100 force-pushed the feature/VPLAY-11143 branch from 5cd2eac to ab4a7fa Compare November 17, 2025 20:21

Copilot AI review requested due to automatic review settings November 18, 2025 04:20

Vinish100 force-pushed the feature/VPLAY-11143 branch from ab4a7fa to 3bf778e Compare November 18, 2025 04:20

Copilot started reviewing on behalf of Vinish100 November 18, 2025 04:20 View session

Copilot finished reviewing on behalf of Vinish100 November 18, 2025 04:21

Copilot started reviewing on behalf of Vinish100 November 24, 2025 13:57 View session

Copilot finished reviewing on behalf of Vinish100 November 24, 2025 14:00

Copilot AI reviewed Nov 24, 2025

View reviewed changes

Vinish100 force-pushed the feature/VPLAY-11143 branch from 092ad05 to ef7a394 Compare December 1, 2025 08:37

Copilot AI review requested due to automatic review settings December 1, 2025 09:08

Vinish100 force-pushed the feature/VPLAY-11143 branch from ef7a394 to 0067eef Compare December 1, 2025 09:08

Vinish100 requested a review from rdkcmf-jenkins December 1, 2025 09:09

Copilot started reviewing on behalf of Vinish100 December 1, 2025 09:09 View session

Copilot finished reviewing on behalf of Vinish100 December 1, 2025 09:11

Copilot AI reviewed Dec 1, 2025

View reviewed changes

test/aampcli/AampcliPlaybackCommand.cpp Show resolved Hide resolved

test/gstTestHarness/mp4demux.hpp Show resolved Hide resolved

middleware/InterfacePlayerRDK.cpp Show resolved Hide resolved

Vinish100 force-pushed the feature/VPLAY-11143 branch from 0067eef to 4eb8855 Compare December 1, 2025 12:20

pstroffolino reviewed Dec 1, 2025

View reviewed changes

Copilot AI review requested due to automatic review settings December 2, 2025 09:42

Copilot AI reviewed Dec 2, 2025

View reviewed changes

Copilot AI review requested due to automatic review settings December 4, 2025 12:09

varshnie force-pushed the feature/VPLAY-11143 branch from 90f5d84 to 1702846 Compare December 4, 2025 12:09

Copilot AI reviewed Dec 4, 2025

View reviewed changes

Vinish100 and others added 8 commits December 5, 2025 11:05

VPLAY-11143: AAMP mp4Demux Integration

e68a8b8

Reason for change: Integrate mp4Demux formally into AAMP Test Procedure: Test with useMp4Demux=true and validate all types of Linear, VOD content in all apps. Risks: Low Signed-off-by: Vinish100 <[email protected]>

VPLAY-11143: AAMP Mp4Demux integration

6bc40cb

Reason for change: Added function headers, split up Mp4Demux.hpp to a .h and .cpp. Code cleanup Test Procedure: Play clear and encrypted content using mp4demux Risks: Low Signed-off-by: Vinish100 <[email protected]>

VPLAY-11143: AAMP mp4Demux Integration

489fb3d

Reason for change: Fix L1s with Mp4Demux Test Procedure: Test with useMp4Demux=true and validate all types of Linear, VOD content in all apps. Risks: Low Signed-off-by: lashmintha <[email protected]>

VPLAY-11143: AAMP mp4Demux Integration

afd0ef0

Reason for change: Fix review comments. Introduced error detection and propogation in Mp4Demuxer. Code cleanup Test Procedure: As mentioned in the ticket Risks: Low Signed-off-by: Vinish100 <[email protected]>

VPLAY-11143: AAMP mp4Demux Integration

d410907

Reason for change:pipeline reconfigure is avoided if stream format is unknown Procedure: As mentioned in the ticket Risks: Low Signed-off-by: varshnie <[email protected]>

VPLAY-11143: AAMP mp4Demux Integration

8303f3b

Reason for change:Removed isobmff format setting hack Procedure: As mentioned in the ticket Risks: Low Signed-off-by: varshnie <[email protected]>

Copilot AI review requested due to automatic review settings December 5, 2025 05:36

lashmintha force-pushed the feature/VPLAY-11143 branch from a26ec9c to 8b19f3b Compare December 5, 2025 05:36

Copilot AI reviewed Dec 5, 2025

View reviewed changes

	gstCodecInfo.codecData = std::move(codecInfo.mCodecData);
	gstCodecInfo.codecData = codecInfo.mCodecData;

VPLAY-11143: AAMP mp4Demux Integration #670

Are you sure you want to change the base?

VPLAY-11143: AAMP mp4Demux Integration #670

Uh oh!

Conversation

Vinish100 commented Nov 13, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Nov 13, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rdkcmf-jenkins commented Nov 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Coverity Issue - Data race condition

Issue location

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rdkcmf-jenkins commented Nov 13, 2025 •

edited

Loading